From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Wed, 2 Oct 2013 14:53:38 +0000 (+0200)
Subject: NetworkMenu/NMDeviceWireless: use the device state instead of active connection state
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3288
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=843f076225570bf0410d6b00562e2cbcaf2bf0ae;p=gnome-shell.git

NetworkMenu/NMDeviceWireless: use the device state instead of active connection state

Since we connect to signals for that, we need to sync on that, or
we can miss a notification.

https://bugzilla.gnome.org/show_bug.cgi?id=709043
---

diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 2a830c81b..c78c6696e 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -1064,7 +1064,8 @@ const NMDeviceWireless = new Lang.Class({
     },
 
     getIndicatorIcon: function() {
-        if (this._device.active_connection.state == NetworkManager.ActiveConnectionState.ACTIVATING)
+        if (this._device.state >= NetworkManager.DeviceState.PREPARE &&
+            this._device.state < NetworkManager.DeviceState.ACTIVATED)
             return 'network-wireless-acquiring-symbolic';
 
         let ap = this._device.active_access_point;